From: Joakim Verona <joakim@verona.se>
Date: Fri, 16 Jan 2015 21:29:10 +0000 (+0100)
Subject: merge master
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3410
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5e2255017323c54feeaaee220175d7761a3b6ed1;p=emacs.git

merge master
---

5e2255017323c54feeaaee220175d7761a3b6ed1